from trunk

diff --cc src/ChangeLog
index 88d31d734e506f63d67d4997e3844d60a877984c,45d8b59618dbb78d3aef4de20887cfa4763cf509..7a3d348e490b0e0d499069fa573539125ecee3bc
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,7 -1,8 +1,12 @@@
 +2010-02-26  Kenichi Handa  <handa@m17n.org>
 +
 +      * xdisp.c (reseat_to_string): Fix previous change.
 +
+ 2010-02-26  David Reitter  <david.reitter@gmail.com>
+ 
+       * nsfont.m (nsfont_draw): ns_antialias_text should be a
+       Lisp_Object (Bug#4736).
+ 
  2010-02-25  Kenichi Handa  <handa@m17n.org>
  
        * xdisp.c (reseat_to_string): Fix previous change (bug#5609).